Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Windows Install Action Fix" #2401

Merged
merged 11 commits into from
Jan 13, 2023
Merged

Revert "Windows Install Action Fix" #2401

merged 11 commits into from
Jan 13, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Jan 13, 2023

Description

Reverts #2308 and uses -i -c as arguments to the windows program to make it equivalent to -y

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

cwperks added 10 commits January 13, 2023 09:57
@cwperks
Revert change in install_demo_configuration to default cluster mode t…
0f865a3 
…o true

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
echo y three times
01a2e43 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Multiple ampersands
2568bdb 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Use array syntax
13f269a 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Multiple ampersands
55ffcd3 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Try powershell -c
1be55a1 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
echo three times
0da5bfb 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Use double ampersand
1cff6aa 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Try single 'y'
7d70318 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Use -i -c
0f8c215 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks requested a review from a team January 13, 2023 16:15
peternied
peternied requested changes Jan 13, 2023
View reviewed changes
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you provide more details on why you would like to revert this change?

@cwperks
Add -y as well
a0a34e4 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Jan 13, 2023

@peternied The buggy behavior that @scrawfor99 identified and fixed was being used during the distribution build to create the containers and as a result the containers created were binding by default to all network interfaces. This change reverts the change back to the expected (not necessary correct) behavior. This change is needed for 2.5.0.

This PR should be followed-up with an analysis to see where these scripts are called from and to update the calls to the correct flags instead of the catchall -y flag.

These scripts will need another option to indicate whether the demo certs should be installed (perhaps -d) and callers of the script should switch to using -d if all they want is to install the demo certificates and nothing more.

@cwperks
Copy link
Member Author

cwperks commented Jan 13, 2023

@peternied I filed a bug report to describe the issue with the install_demo_configuration scripts: #2402

@cwperks cwperks added backport 1.3 backport to 1.3 branch backport 2.x backport to 2.x branch backport 2.4 backport 2.5 backport to 2.5 branch labels Jan 13, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jan 13, 2023 •
edited
Loading

Codecov Report

Merging #2401 (a0a34e4) into main (b0116b7) will decrease coverage by 0.16%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #2401      +/-   ##
============================================
- Coverage     61.21%   61.04%   -0.17%     
+ Complexity     3277     3268       -9     
============================================
  Files           260      260              
  Lines         18362    18362              
  Branches       3249     3249              
============================================
- Hits          11241    11210      -31     
- Misses         5535     5563      +28     
- Partials       1586     1589       +3
Impacted Files Coverage Δ
...t/keybyoidc/AuthenticatorUnavailableException.java 0.00% <0.00%> (-20.00%) ⬇️
.../auth/http/jwt/keybyoidc/SelfRefreshingKeySet.java 59.85% <0.00%> (-8.46%) ⬇️
...ch/security/auditlog/routing/AsyncStoragePool.java 50.00% <0.00%> (-5.56%) ⬇️
...urity/ssl/transport/SecuritySSLNettyTransport.java 62.36% <0.00%> (-4.31%) ⬇️
...ic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java 54.76% <0.00%> (-3.58%) ⬇️
...earch/security/ssl/util/SSLConnectionTestUtil.java 93.18% <0.00%> (-2.28%) ⬇️
...ecurity/configuration/ConfigurationRepository.java 72.13% <0.00%> (-2.19%) ⬇️
.../dlic/auth/ldap2/LDAPConnectionFactoryFactory.java 57.46% <0.00%> (-1.50%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

peternied
peternied approved these changes Jan 13, 2023
View reviewed changes
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the context, net net we cannot modify the existing parameters

@peternied peternied merged commit 9cdaeca into opensearch-project:main Jan 13, 2023
@peternied
Copy link
Member

Note; plugin installation has passed, this file has no impact on other tests.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-2401-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9cdaeca7e97ca4a4351a2d7bbc729db0f4a1704e
# Push it to GitHub
git push --set-upstream origin backport/backport-2401-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-2401-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2401-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9cdaeca7e97ca4a4351a2d7bbc729db0f4a1704e
# Push it to GitHub
git push --set-upstream origin backport/backport-2401-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2401-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.4 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.4 2.4
# Navigate to the new working tree
cd .worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-2401-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9cdaeca7e97ca4a4351a2d7bbc729db0f4a1704e
# Push it to GitHub
git push --set-upstream origin backport/backport-2401-to-2.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.4

Then, create a pull request where the base branch is 2.4 and the compare/head branch is backport/backport-2401-to-2.4.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-2401-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9cdaeca7e97ca4a4351a2d7bbc729db0f4a1704e
# Push it to GitHub
git push --set-upstream origin backport/backport-2401-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport/backport-2401-to-2.5.

@peternied
Copy link
Member

@cwperks Looks like the backports will need attention

This was referenced Jan 13, 2023
Merged
Merged
This was referenced Jan 13, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peternied peternied peternied approved these changes

Assignees
No one assigned
Labels
backport 1.3 backport to 1.3 branch backport 2.x backport to 2.x branch backport 2.4 backport 2.5 backport to 2.5 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cwperks @codecov-commenter @peternied